Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve upstream conflicts #5

Merged
merged 3 commits into from
Mar 22, 2022
Merged

Resolve upstream conflicts #5

merged 3 commits into from
Mar 22, 2022

Conversation

dsvanlani
Copy link

No description provided.

tigrannajaryan and others added 3 commits March 9, 2022 14:06
Resolves open-telemetry#65

- Added signature field to DownloadableFile message.
- Added a short explanation about how the signature field can be used
  for detached signatures.
…n-telemetry#63)

This is a first approach towards open-telemetry#56 

It assumes that Agent's `instance_uid` can always be updated by Server (since resolving potential issues with conflicts is important).

There's a gap with multiplexed websocket connections which perhaps could be handled by adding Agent capability flag indicating if overrides can be accepted or not
@dsvanlani dsvanlani merged commit e1da738 into main Mar 22, 2022
@dsvanlani dsvanlani deleted the open-telemetry-main branch March 22, 2022 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants